Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 2 Aug 2010 22:48:42 +0000 (22:48 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 2 Aug 2010 22:48:42 +0000 (22:48 +0000)

Trivial merge